From 8f19db7565ba615e1613ccf0dfcd860043797339 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 13 Jul 2010 15:52:56 +0200 Subject: [PATCH] Replace gdk_rgb_find_color() Use gdk_colormap_alloc_color() instead. --- gdk/gdkgc.c | 7 ++++--- tests/testwindows.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index 65141c68a0..d546a49023 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -31,7 +31,6 @@ #include "gdkgc.h" #include "gdkinternals.h" #include "gdkpixmap.h" -#include "gdkrgb.h" #include "gdkprivate.h" @@ -1205,7 +1204,8 @@ gdk_gc_set_rgb_fg_color (GdkGC *gc, return; tmp_color = *color; - gdk_rgb_find_color (cmap, &tmp_color); + if (!gdk_colormap_alloc_color (cmap, &tmp_color, FALSE, TRUE)) + return; gdk_gc_set_foreground (gc, &tmp_color); } @@ -1237,7 +1237,8 @@ gdk_gc_set_rgb_bg_color (GdkGC *gc, return; tmp_color = *color; - gdk_rgb_find_color (cmap, &tmp_color); + if (!gdk_colormap_alloc_color (cmap, &tmp_color, FALSE, TRUE)) + return; gdk_gc_set_background (gc, &tmp_color); } diff --git a/tests/testwindows.c b/tests/testwindows.c index 457072a8fa..93ca976831 100644 --- a/tests/testwindows.c +++ b/tests/testwindows.c @@ -51,7 +51,8 @@ create_window (GdkWindow *parent, bg->green = g_random_int_range (0, 0xffff);; } - gdk_rgb_find_color (gtk_widget_get_colormap (darea), bg); + if (!gdk_colormap_alloc_color (gtk_widget_get_colormap (darea), bg, FALSE, TRUE)) + g_assert_not_reached (); gdk_window_set_background (window, bg); g_object_set_data_full (G_OBJECT (window), "color", bg, g_free); -- 2.30.2